diff --git a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/CustomFieldFilterInstrumentedUnitTest.kt b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/CustomFieldFilterInstrumentedUnitTest.kt
index f3acfcbc..8f732f0e 100644
--- a/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/CustomFieldFilterInstrumentedUnitTest.kt
+++ b/app/src/androidTest/java/net/pokeranalytics/android/unitTests/filter/CustomFieldFilterInstrumentedUnitTest.kt
@@ -22,12 +22,11 @@ class CustomFieldFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
         val realm = this.mockRealm
         realm.beginTransaction()
 
-        val cf1 = CustomField()
-        cf1.id = "1"
+        val cf1 = realm.createObject(CustomField::class.java, "1")
         cf1.type = CustomField.Type.LIST.ordinal
 
-        val cfe1 = CustomFieldEntry()
-        val cfe2 = CustomFieldEntry()
+        val cfe1 = realm.createObject(CustomFieldEntry::class.java, "9")
+        val cfe2 = realm.createObject(CustomFieldEntry::class.java, "8")
         cfe1.value = "super"
         cfe2.value = "nul"
 
@@ -51,24 +50,21 @@ class CustomFieldFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
     @Test
     fun testCustomFieldAmountFilter() {
 
-        val cf1Id = "1234"
+        val cfId = "1234"
         var s2Id = ""
 
         val realm = this.mockRealm
         realm.executeTransaction {
 
-            val cf1 = CustomField()
-            cf1.id = cf1Id
-            cf1.type = CustomField.Type.AMOUNT.ordinal
+            val cf = realm.createObject(CustomField::class.java, cfId)
+            cf.type = CustomField.Type.AMOUNT.ordinal
 
-            val cfe1 = CustomFieldEntry()
-            cfe1.id = "999"
-            cf1.entries.add(cfe1)
+            val cfe1 = realm.createObject(CustomFieldEntry::class.java, "999")
+            cf.entries.add(cfe1)
             cfe1.numericValue = 30.0
 
-            val cfe2 = CustomFieldEntry()
-            cfe2.id = "888"
-            cf1.entries.add(cfe2)
+            val cfe2 = realm.createObject(CustomFieldEntry::class.java, "888")
+            cf.entries.add(cfe2)
             cfe2.numericValue = 100.0
 
             val s1 = Session.testInstance(100.0, false, Date(), 1)
@@ -78,7 +74,7 @@ class CustomFieldFilterInstrumentedUnitTest : BaseFilterInstrumentedUnitTest() {
             s2Id = s2.id
         }
 
-        val condition = QueryCondition.CustomFieldNumberQuery(cf1Id, 100.0)
+        val condition = QueryCondition.CustomFieldNumberQuery(cfId, 100.0)
         val sessions = Filter.queryOn<Session>(realm, Query(condition))
 
         Assert.assertEquals(1, sessions.size)
diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
index 2907fd06..06e34c97 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
@@ -645,7 +645,7 @@ sealed class QueryCondition : FilterElementRow {
 
 		constructor(customFieldEntry: CustomFieldEntry) : this() {
 			this.setObject(customFieldEntry)
-			this.customFieldId = customFieldEntry.customFields?.firstOrNull()?.id
+			this.customFieldId = customFieldEntry.customField?.id
 				?: throw PokerAnalyticsException.QueryValueMapUnexpectedValue
 		}