diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index f081b67..ab3babf 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="PS-223.8214.64">
+  <component name="dataSourceStorageLocal" created-in="PS-232.8660.205">
     <data-source name="MySQL - testdb@localhost" uuid="817a3756-e8a9-4117-8fa8-d780a864bbfb">
       <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
       <schema-mapping />
diff --git a/.idea/instarecord.iml b/.idea/instarecord.iml
index 0fc59c4..f8118e2 100644
--- a/.idea/instarecord.iml
+++ b/.idea/instarecord.iml
@@ -2,8 +2,8 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" packagePrefix="Softwarepunt\Instarecord\" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Softwarepunt\Instarecord\Tests\" />
+      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" packagePrefix="SoftwarePunt\Instarecord\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="false" packagePrefix="SoftwarePunt\Instarecord\Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
diff --git a/.idea/php.xml b/.idea/php.xml
index b980d47..8e2ffea 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -50,22 +50,22 @@
   </component>
   <component name="PhpInterpreters">
     <interpreters>
-      <interpreter id="0ab791b6-a467-46e4-9037-d4a2505e74a9" name="Ubuntu" home="\\wsl$\Ubuntu/usr/bin/php" debugger_id="php.debugger.XDebug">
-        <remote_data INTERPRETER_PATH="/usr/bin/php" HELPERS_PATH="" INITIALIZED="false" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DISTRIBUTION_ID="Ubuntu" />
+      <interpreter id="0ab791b6-a467-46e4-9037-d4a2505e74a9" name="Ubuntu" home="\\wsl$\Ubuntu/usr/bin/php" auto="false" debugger_id="php.debugger.XDebug">
+        <remote_data INTERPRETER_PATH="/usr/bin/php" HELPERS_PATH="" VALID="true" RUN_AS_ROOT_VIA_SUDO="false" DISTRIBUTION_ID="Ubuntu" />
       </interpreter>
     </interpreters>
   </component>
   <component name="PhpInterpretersPhpInfoCache">
     <phpInfoCache>
       <interpreter name="Ubuntu">
-        <phpinfo binary_type="PHP" php_cli="/usr/bin/php8.1" path_separator=":" remote_host="192.168.48.1" version="8.1.2">
-          <additional_php_ini>/etc/php/8.1/cli/conf.d/10-mysqlnd.ini, /etc/php/8.1/cli/conf.d/10-opcache.ini, /etc/php/8.1/cli/conf.d/10-pdo.ini, /etc/php/8.1/cli/conf.d/15-xml.ini, /etc/php/8.1/cli/conf.d/20-apcu.ini, /etc/php/8.1/cli/conf.d/20-bcmath.ini, /etc/php/8.1/cli/conf.d/20-calendar.ini, /etc/php/8.1/cli/conf.d/20-ctype.ini, /etc/php/8.1/cli/conf.d/20-curl.ini, /etc/php/8.1/cli/conf.d/20-dom.ini, /etc/php/8.1/cli/conf.d/20-exif.ini, /etc/php/8.1/cli/conf.d/20-ffi.ini, /etc/php/8.1/cli/conf.d/20-fileinfo.ini, /etc/php/8.1/cli/conf.d/20-ftp.ini, /etc/php/8.1/cli/conf.d/20-gd.ini, /etc/php/8.1/cli/conf.d/20-gettext.ini, /etc/php/8.1/cli/conf.d/20-iconv.ini, /etc/php/8.1/cli/conf.d/20-igbinary.ini, /etc/php/8.1/cli/conf.d/20-imagick.ini, /etc/php/8.1/cli/conf.d/20-intl.ini, /etc/php/8.1/cli/conf.d/20-mbstring.ini, /etc/php/8.1/cli/conf.d/20-mcrypt.ini, /etc/php/8.1/cli/conf.d/20-mysqli.ini, /etc/php/8.1/cli/conf.d/20-pdo_mysql.ini, /etc/php/8.1/cli/conf.d/20-phar.ini, /etc/php/8.1/cli/conf.d/20-posix.ini, /etc/php/8.1/cli/conf.d/20-readline.ini, /etc/php/8.1/cli/conf.d/20-redis.ini, /etc/php/8.1/cli/conf.d/20-shmop.ini, /etc/php/8.1/cli/conf.d/20-simplexml.ini, /etc/php/8.1/cli/conf.d/20-sockets.ini, /etc/php/8.1/cli/conf.d/20-ssh2.ini, /etc/php/8.1/cli/conf.d/20-sysvmsg.ini, /etc/php/8.1/cli/conf.d/20-sysvsem.ini, /etc/php/8.1/cli/conf.d/20-sysvshm.ini, /etc/php/8.1/cli/conf.d/20-tokenizer.ini, /etc/php/8.1/cli/conf.d/20-xdebug.ini, /etc/php/8.1/cli/conf.d/20-xmlreader.ini, /etc/php/8.1/cli/conf.d/20-xmlwriter.ini, /etc/php/8.1/cli/conf.d/20-xsl.ini, /etc/php/8.1/cli/conf.d/20-zip.ini</additional_php_ini>
-          <configuration_file>/etc/php/8.1/cli/php.ini</configuration_file>
+        <phpinfo binary_type="PHP" php_cli="/usr/bin/php8.2" path_separator=":" remote_host="172.23.176.1" version="8.2.7">
+          <additional_php_ini>/etc/php/8.2/cli/conf.d/10-mysqlnd.ini, /etc/php/8.2/cli/conf.d/10-opcache.ini, /etc/php/8.2/cli/conf.d/10-pdo.ini, /etc/php/8.2/cli/conf.d/15-xml.ini, /etc/php/8.2/cli/conf.d/20-apcu.ini, /etc/php/8.2/cli/conf.d/20-bcmath.ini, /etc/php/8.2/cli/conf.d/20-calendar.ini, /etc/php/8.2/cli/conf.d/20-ctype.ini, /etc/php/8.2/cli/conf.d/20-curl.ini, /etc/php/8.2/cli/conf.d/20-dom.ini, /etc/php/8.2/cli/conf.d/20-exif.ini, /etc/php/8.2/cli/conf.d/20-ffi.ini, /etc/php/8.2/cli/conf.d/20-fileinfo.ini, /etc/php/8.2/cli/conf.d/20-ftp.ini, /etc/php/8.2/cli/conf.d/20-gd.ini, /etc/php/8.2/cli/conf.d/20-gettext.ini, /etc/php/8.2/cli/conf.d/20-iconv.ini, /etc/php/8.2/cli/conf.d/20-igbinary.ini, /etc/php/8.2/cli/conf.d/20-imagick.ini, /etc/php/8.2/cli/conf.d/20-intl.ini, /etc/php/8.2/cli/conf.d/20-mbstring.ini, /etc/php/8.2/cli/conf.d/20-mysqli.ini, /etc/php/8.2/cli/conf.d/20-pdo_mysql.ini, /etc/php/8.2/cli/conf.d/20-pdo_pgsql.ini, /etc/php/8.2/cli/conf.d/20-pgsql.ini, /etc/php/8.2/cli/conf.d/20-phar.ini, /etc/php/8.2/cli/conf.d/20-posix.ini, /etc/php/8.2/cli/conf.d/20-readline.ini, /etc/php/8.2/cli/conf.d/20-redis.ini, /etc/php/8.2/cli/conf.d/20-shmop.ini, /etc/php/8.2/cli/conf.d/20-simplexml.ini, /etc/php/8.2/cli/conf.d/20-soap.ini, /etc/php/8.2/cli/conf.d/20-sockets.ini, /etc/php/8.2/cli/conf.d/20-ssh2.ini, /etc/php/8.2/cli/conf.d/20-sysvmsg.ini, /etc/php/8.2/cli/conf.d/20-sysvsem.ini, /etc/php/8.2/cli/conf.d/20-sysvshm.ini, /etc/php/8.2/cli/conf.d/20-tokenizer.ini, /etc/php/8.2/cli/conf.d/20-xdebug.ini, /etc/php/8.2/cli/conf.d/20-xmlreader.ini, /etc/php/8.2/cli/conf.d/20-xmlwriter.ini, /etc/php/8.2/cli/conf.d/20-xsl.ini, /etc/php/8.2/cli/conf.d/20-yaml.ini, /etc/php/8.2/cli/conf.d/20-zip.ini</additional_php_ini>
+          <configuration_file>/etc/php/8.2/cli/php.ini</configuration_file>
           <configuration_options>
             <configuration_option name="include_path" value=".:/usr/share/php" />
           </configuration_options>
           <debuggers>
-            <debugger_info debugger="xdebug" debugger_version="3.1.2">
+            <debugger_info debugger="xdebug" debugger_version="3.2.1">
               <debug_extensions />
             </debugger_info>
           </debuggers>
@@ -99,18 +99,21 @@
             <extension name="json" />
             <extension name="libxml" />
             <extension name="mbstring" />
-            <extension name="mcrypt" />
             <extension name="mysqli" />
             <extension name="mysqlnd" />
             <extension name="openssl" />
             <extension name="pcntl" />
             <extension name="pcre" />
             <extension name="pdo_mysql" />
+            <extension name="pdo_pgsql" />
+            <extension name="pgsql" />
             <extension name="posix" />
+            <extension name="random" />
             <extension name="readline" />
             <extension name="redis" />
             <extension name="session" />
             <extension name="shmop" />
+            <extension name="soap" />
             <extension name="sockets" />
             <extension name="sodium" />
             <extension name="ssh2" />
@@ -124,6 +127,7 @@
             <extension name="xmlreader" />
             <extension name="xmlwriter" />
             <extension name="xsl" />
+            <extension name="yaml" />
             <extension name="zip" />
             <extension name="zlib" />
           </loaded_extensions>
diff --git a/lib/Database/Query.php b/lib/Database/Query.php
index f04fec3..2d5f8e7 100644
--- a/lib/Database/Query.php
+++ b/lib/Database/Query.php
@@ -437,10 +437,9 @@ protected function processStatementParameters(string $statementText, array $para
 
                         if ($markerSkip <= 0) {
                             break;
-                        } else {
-                            $markerOffset += $markerIdx + 1;
                         }
 
+                        $markerOffset = $markerIdx + 1;
                         $markerSkip--;
                     }
 
@@ -451,11 +450,10 @@ protected function processStatementParameters(string $statementText, array $para
                         $extraMarkersStr = "";
 
                         for ($i = 0; $i < $extraMarkers; $i++) {
-                            $extraMarkersStr .= ", ?";
+                            $extraMarkersStr .= ", #_TEMP_MARKER_#";
                         }
 
                         $statementText = substr_replace($statementText, $extraMarkersStr, $markerIdx + 1, 0);
-                        $finalizedRow[0] = $statementText;
                     }
 
                     // Bind each parameter
@@ -468,6 +466,9 @@ protected function processStatementParameters(string $statementText, array $para
             }
         }
 
+        $statementText = str_replace('#_TEMP_MARKER_#', '?', $statementText);
+        $finalizedRow[0] = $statementText;
+
         return $finalizedRow;
     }
 
diff --git a/tests/Database/QueryTest.php b/tests/Database/QueryTest.php
index c6cc692..c5be0c0 100644
--- a/tests/Database/QueryTest.php
+++ b/tests/Database/QueryTest.php
@@ -318,6 +318,29 @@ public function testWhereWithAnd()
         $this->assertEquals('DELETE FROM fruits WHERE (type = ?) AND (color IN (?, ?)) AND (tastes_nice = 1);', $queryString);
     }
 
+    public function testWhereWithMultipleINs()
+    {
+        $query = new Query(new Connection(new DatabaseConfig()));
+
+        $query = $query->delete()
+            ->from('fruits')
+            ->where('color = ? OR (color IN (?)) OR (color IN (?))',
+                'pink', ['red', 'blue', 'orange'], ['blurple', 'black']);
+
+        $queryString = $query->createStatementText();
+
+        $this->assertEquals('DELETE FROM fruits WHERE (color = ? OR (color IN (?, ?, ?)) OR (color IN (?, ?)));', $queryString);
+
+        $this->assertEquals([
+            'pink',
+            'red',
+            'blue',
+            'orange',
+            'blurple',
+            'black'
+        ], $query->getBoundParametersForGeneratedStatement());
+    }
+
     public function testHaving()
     {
         $query = new Query(new Connection(new DatabaseConfig()));