diff --git a/dabo/functions/order.sh b/dabo/functions/order.sh
index d352874..1aef94d 100644
--- a/dabo/functions/order.sh
+++ b/dabo/functions/order.sh
@@ -103,38 +103,44 @@ function order {
 
 
   # Add stoploos and take profit if available
-  if [ -n "$f_stoploss" ] && [[ $f_type = limit ]]
+  if [ -n "$f_stoploss" ]
   then
-    # check for long
-    if [[ $f_side = buy ]] && g_num_is_higher_equal $f_stoploss $f_price
+    if [[ $f_type = limit ]]
     then
-      g_echo_warn "Long Order not possible: Stoploss ($f_stoploss) higher then buy price ($f_price)"
-      return 1
+      # check for long
+      if [[ $f_side = buy ]] && g_num_is_higher_equal $f_stoploss $f_price
+      then
+        g_echo_warn "Long Order not possible: Stoploss ($f_stoploss) higher then buy price ($f_price)"
+        return 1
+      fi
+      # check for short
+      if [[ $f_side = sell ]] && g_num_is_lower_equal $f_stoploss $f_price 
+      then
+        g_echo_warn "Short Order not possible: Stoploss ($f_stoploss) lower then buy price ($f_price)"
+        return 1
+      fi 
     fi
-    # check for short
-    if [[ $f_side = sell ]] && g_num_is_lower_equal $f_stoploss $f_price 
-    then
-      g_echo_warn "Short Order not possible: Stoploss ($f_stoploss) lower then buy price ($f_price)"
-      return 1
-    fi 
     f_ccxt "print($STOCK_EXCHANGE.priceToPrecision('${f_symbol}', ${f_stoploss}))"
     f_stoploss=$f_ccxt_result
     f_params="${f_params}'stopLossPrice': '$f_stoploss', "
   fi
-  if [ -n "$f_takeprofit" ] && [[ $f_type = limit ]]
+  if [ -n "$f_takeprofit" ]
   then
     # check for long
-    if [[ $f_side = buy ]] && g_num_is_lower_equal $f_takeprofit $f_price
+    if [[ $f_type = limit ]]
     then
-      g_echo_warn "Long Order not possible:TakeProfit ($f_takeprofit) lower then buy price ($f_price)"
-      return 1
-    fi 
-    # check for short
-    if [[ $f_side = sell ]] && g_num_is_higher_equal $f_takeprofit $f_price
-    then
-      g_echo_warn "Short Order not possible:TakeProfit ($f_takeprofit) higher then buy price ($f_price)"
-      return 1
-    fi 
+      if [[ $f_side = buy ]] && g_num_is_lower_equal $f_takeprofit $f_price
+      then
+        g_echo_warn "Long Order not possible:TakeProfit ($f_takeprofit) lower then buy price ($f_price)"
+        return 1
+      fi 
+      # check for short
+      if [[ $f_side = sell ]] && g_num_is_higher_equal $f_takeprofit $f_price
+      then
+        g_echo_warn "Short Order not possible:TakeProfit ($f_takeprofit) higher then buy price ($f_price)"
+        return 1
+      fi 
+    fi
     f_ccxt "print($STOCK_EXCHANGE.priceToPrecision('${f_symbol}', ${f_takeprofit}))"
     f_takeprofit=$f_ccxt_result
     f_params="${f_params}'takeProfitPrice': '$f_takeprofit', "