diff --git a/src/com/activeandroid/Configuration.java b/src/com/activeandroid/Configuration.java
index b197d2234..4c06d9150 100644
--- a/src/com/activeandroid/Configuration.java
+++ b/src/com/activeandroid/Configuration.java
@@ -104,7 +104,7 @@ public static class Builder {
 
 		private static final int DEFAULT_CACHE_SIZE = 1024;
 		private static final String DEFAULT_DB_NAME = "Application.db";
-		private static final String DEFAULT_SQL_PARSER = SQL_PARSER_LEGACY;
+		private static final String DEFAULT_SQL_PARSER = SQL_PARSER_DELIMITED;
 
 		//////////////////////////////////////////////////////////////////////////////////////
 		// PRIVATE MEMBERS
diff --git a/src/com/activeandroid/DatabaseHelper.java b/src/com/activeandroid/DatabaseHelper.java
index 7158c5bb6..9d28000a7 100644
--- a/src/com/activeandroid/DatabaseHelper.java
+++ b/src/com/activeandroid/DatabaseHelper.java
@@ -49,6 +49,7 @@ public final class DatabaseHelper extends SQLiteOpenHelper {
     // PRIVATE FIELDS
     //////////////////////////////////////////////////////////////////////////////////////
 
+    private Configuration mConfiguration;
     private final String mSqlParser;
 
 	//////////////////////////////////////////////////////////////////////////////////////
@@ -59,6 +60,7 @@ public DatabaseHelper(Configuration configuration) {
 		super(configuration.getContext(), configuration.getDatabaseName(), null, configuration.getDatabaseVersion());
 		copyAttachedDatabase(configuration.getContext(), configuration.getDatabaseName());
 		mSqlParser = configuration.getSqlParser();
+		mConfiguration = configuration;
 	}
 
 	//////////////////////////////////////////////////////////////////////////////////////
@@ -73,15 +75,13 @@ public void onOpen(SQLiteDatabase db) {
 	@Override
 	public void onCreate(SQLiteDatabase db) {
 		executePragmas(db);
-		executeCreate(db);
-		executeMigrations(db, -1, db.getVersion());
+		executeMigrations(db, -1, mConfiguration.getDatabaseVersion());
 		executeCreateIndex(db);
 	}
 
 	@Override
 	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
 		executePragmas(db);
-		executeCreate(db);
 		executeMigrations(db, oldVersion, newVersion);
 	}