diff --git a/package.json b/package.json
index ba952951..89dee426 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "roast-my-code",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "description": "mean and aggressive code reviews by ChatGPT",
     "main": "lib/main.js",
     "author": "Christina Martinez, based on work by Ville Saukkonen",
diff --git a/src/main.ts b/src/main.ts
index 9e78e5d1..028c8067 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -164,16 +164,31 @@ function createComment(
         reviewComment: string;
     }>
 ): Array<{ body: string; path: string; line: number }> {
-    return aiResponses.flatMap((aiResponse) => {
+    const comments = aiResponses.flatMap((aiResponse) => {
         if (!file.to) {
             return [];
         }
-        return {
-            body: aiResponse.reviewComment,
-            path: file.to,
-            line: Number(aiResponse.lineNumber),
-        };
+        const lineNumber = Number(aiResponse.lineNumber);
+        if (
+            chunk.changes.some(
+                (change: any) =>
+                    change.ln === lineNumber || change.ln2 === lineNumber
+            )
+        ) {
+            return {
+                body: aiResponse.reviewComment,
+                path: file.to,
+                line: lineNumber,
+            };
+        } else {
+            console.warn(
+                `Line number ${lineNumber} does not exist in the diff for file ${file.to}`
+            );
+            return [];
+        }
     });
+    console.log("Comments:", comments);
+    return comments;
 }
 
 async function createReviewComment(