diff --git a/pr_agent/agent/pr_agent.py b/pr_agent/agent/pr_agent.py
index 3709db1f..672a7a94 100644
--- a/pr_agent/agent/pr_agent.py
+++ b/pr_agent/agent/pr_agent.py
@@ -16,7 +16,7 @@ class PRAgent:
         if any(cmd in request for cmd in ["/answer"]):
             await PRReviewer(pr_url, is_answer=True).review()
         elif any(cmd in request for cmd in ["/review", "/review_pr", "/reflect_and_review"]):
-            if settings.pr_reviewer.ask_and_reflect or any(cmd in request for cmd in ["/reflect_and_review"]):
+            if settings.pr_reviewer.ask_and_reflect or "/reflect_and_review" in request:
                 await PRInformationFromUser(pr_url).generate_questions()
             else:
                 await PRReviewer(pr_url).review()
diff --git a/pr_agent/tools/pr_reviewer.py b/pr_agent/tools/pr_reviewer.py
index 2ceeef8b..0c9ab07e 100644
--- a/pr_agent/tools/pr_reviewer.py
+++ b/pr_agent/tools/pr_reviewer.py
@@ -125,7 +125,7 @@ class PRReviewer:
         except json.decoder.JSONDecodeError:
             data = try_fix_json(review)
 
-        if settings.get("CONFIG.PR_REVIEWER.NUM_CODE_SUGGESTIONS", 0):
+        if settings.pr_reviewer.num_code_suggestions > 0:
             try:
                 for d in data['PR Feedback']['Code suggestions']:
                     relevant_file = d['relevant file'].strip()