diff --git a/include/class.setup.php b/include/class.setup.php
index d2c16cb1090fd8bb26e7caa13948c6621d6a0f31..f281da61b59a910063af511bcb2a0d0ff9da7cf7 100644
--- a/include/class.setup.php
+++ b/include/class.setup.php
@@ -52,7 +52,9 @@ Class SetupWizard {
         # Replace table prefix
         $schema = str_replace('%TABLE_PREFIX%', $prefix, $schema);
         # Split by semicolons - and cleanup
-        if(!($statements = array_filter(array_map('trim', @explode(';', $schema)))))
+        if(!($statements = array_filter(array_map('trim',
+                // Thanks, http://stackoverflow.com/a/3147901
+                preg_split("/;(?=(?:[^']*'[^']*')*[^']*$)/", $schema)))))
             return $this->abort('Error parsing SQL schema', $debug);
 
 
diff --git a/include/upgrader/streams/core/d51f303a-ec19794f.patch.sql b/include/upgrader/streams/core/d51f303a-ec19794f.patch.sql
index 52449d9aa9d177796fb29f93b3f3d7481c0117ae..887ae1b6992fbf786533740d9de35dfb1be87f5e 100644
--- a/include/upgrader/streams/core/d51f303a-ec19794f.patch.sql
+++ b/include/upgrader/streams/core/d51f303a-ec19794f.patch.sql
@@ -1,6 +1,6 @@
 /**
  * @signature ec19794f1fc8d6a54ac217d6e8006a85
- * @version 1.8.0
+ * @version 1.8.0 - HTML ticket thread
  *
  * Migrate to a single attachment table to allow for inline image support
  * with an almost countless number of attachment tables to support what is