diff --git a/src/services/indicatorService.ts b/src/services/indicatorService.ts
index 1eb8bdc..1b454dc 100644
--- a/src/services/indicatorService.ts
+++ b/src/services/indicatorService.ts
@@ -36,7 +36,7 @@ export class IndicatorService {
     }
     let close = candles.map((c) => c.close);
     const ema34 = EMA.calculate({
-      period: 34,
+      period: 20,
       values: close,
       reversedInput: true,
     });
@@ -244,19 +244,19 @@ export class IndicatorService {
     );
     let entry = candles[0].close;
     if (side === "buy") {
-      if (analysis.currentBB.upper < candles[0].close && analysis.currentBB.upper > candles[0].open) {
+      if (analysis.currentBB.upper < Math.max(candles[0].close, candles[0].open)) {
         entry = analysis.currentBB.upper;
       }
-      if (analysis.currentBB.lower < candles[0].close && analysis.currentBB.lower > candles[0].open) {
+      if (analysis.currentBB.lower < candles[0].open && analysis.currentBB.lower > candles[0].close) {
         entry = analysis.currentBB.lower;
       }
     }
 
     if (side === "sell") {
-      if (analysis.currentBB.lower > candles[0].close && analysis.currentBB.lower < candles[0].open) {
+      if (analysis.currentBB.lower > Math.min(candles[0].close, candles[0].open)) {
         entry = analysis.currentBB.lower;
       }
-      if (analysis.currentBB.upper > candles[0].close && analysis.currentBB.upper < candles[0].open) {
+      if (analysis.currentBB.upper > candles[0].open && analysis.currentBB.upper < candles[0].close) {
         entry = analysis.currentBB.upper;
       }
     }