diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
index e031ba4d..d73670c7 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
@@ -53,8 +53,8 @@ class Maimai2(
 
     // Use reflection to get all properties in Mai2Repos with matching names in Maimai2DataExport
     val exportFields: Map<Field, UserLinked<*>> = listOf(*Maimai2DataExport::class.java.declaredFields)
+        .filter { f -> f.name !in setOf("gameId", "userData") }
         .associateWith { Mai2Repos::class.declaredMembers
-            .filter { f -> f.name !in setOf("gameId", "userData") }
             .filter { f -> f returns UserLinked::class }
             .firstOrNull { f -> f.name == it.name || f.name == it.name.replace("List", "") }
             ?.call(repos) as UserLinked<*>? ?: error("No matching field found for ${it.name}")
@@ -64,7 +64,6 @@ class Maimai2(
         gameId = "SDEZ"
         userData = repos.userData.findByCard(u.ghostCard) ?: (404 - "User not found")
         exportFields.forEach { (f, u) ->
-            if (f.name == "gameId" || f.name == "userData") return@forEach
             f.set(this, if (f.type == List::class.java) u.findByUser(userData)
             else u.findSingleByUser(userData).orElse(null))
         }
diff --git a/src/main/resources/db/migration/mariadb/V1000_6__chusan_playlog_sunplus_fields.sql b/src/main/resources/db/migration/mariadb/V1000_6__chusan_playlog_sunplus_fields.sql
index 7ad9273e..0332e3ac 100644
--- a/src/main/resources/db/migration/mariadb/V1000_6__chusan_playlog_sunplus_fields.sql
+++ b/src/main/resources/db/migration/mariadb/V1000_6__chusan_playlog_sunplus_fields.sql
@@ -1,17 +1,8 @@
 ALTER TABLE chusan_user_playlog
-    ADD machine_type INT NULL;
+    ADD machine_type INT NOT NULL DEFAULT 0;
 
 ALTER TABLE chusan_user_playlog
-    ADD region_id INT NULL;
+    ADD region_id INT NOT NULL DEFAULT 0;
 
 ALTER TABLE chusan_user_playlog
-    ADD ticket_id INT NULL;
-
-ALTER TABLE chusan_user_playlog
-    MODIFY machine_type INT NOT NULL DEFAULT 0;
-
-ALTER TABLE chusan_user_playlog
-    MODIFY region_id INT NOT NULL DEFAULT 0;
-
-ALTER TABLE chusan_user_playlog
-    MODIFY ticket_id INT NOT NULL DEFAULT 0;
+    ADD ticket_id INT NOT NULL DEFAULT 0;