diff --git a/build.gradle.kts b/build.gradle.kts
index 28f3c78b..91891788 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,7 +42,7 @@ intellij {
   pluginName.set(properties("pluginName"))
   version.set(properties("platformVersion"))
   type.set(properties("platformType"))
-  plugins.set(listOf("java", "PythonCore:233.14808.12", "Git4Idea"))
+  plugins.set(listOf("java", "PythonCore:232.9921.47", "Git4Idea"))
 }
 
 changelog {
diff --git a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java
index 15ec576b..baea6f8b 100644
--- a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java
+++ b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionRequestProvider.java
@@ -26,7 +26,8 @@ public class CodeCompletionRequestProvider {
 
   public LlamaCompletionRequest buildLlamaRequest() {
     InfillPromptTemplate promptTemplate = getLlamaInfillPromptTemplate();
-    String prompt = promptTemplate.buildPrompt(details.getPrefix(), details.getSuffix());
+    String prompt = promptTemplate.buildPrompt(
+        new InfillRequestDetails(details.getPrefix(), details.getSuffix(), null));
     return new LlamaCompletionRequest.Builder(prompt)
         .setN_predict(MAX_TOKENS)
         .setStream(true)
diff --git a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java
index 336b072e..cf7d1f37 100644
--- a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java
+++ b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java
@@ -88,7 +88,10 @@ public final class CodeCompletionServiceOld implements Disposable {
       return;
     }
 
-    var request = InfillRequestDetails.Companion.fromDocumentWithMaxOffset(document, offset);
+    var prefix = document.getText(new TextRange(0, offset));
+    var suffix = document.getText(new TextRange(offset, document.getTextLength()));
+
+    var request = InfillRequestDetails.Companion.withoutContext(prefix, suffix);
     if (Stream.of(request.getSuffix(), request.getPrefix()).anyMatch(String::isEmpty)) {
       return;
     }