diff --git a/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents b/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents
index 6febc5b..d0e2d03 100644
--- a/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents	
+++ b/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="13772" systemVersion="16G1114" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="18A391" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
     <entity name="Cheat" representedClassName="Cheat" syncable="YES">
         <attribute name="code" attributeType="String" syncable="YES"/>
         <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
@@ -61,7 +61,7 @@
             </userInfo>
         </attribute>
         <relationship name="cheats" toMany="YES" deletionRule="Cascade" destinationEntity="Cheat" inverseName="game" inverseEntity="Cheat" syncable="YES"/>
-        <relationship name="gameCollections" toMany="YES" deletionRule="Nullify" destinationEntity="GameCollection" inverseName="games" inverseEntity="GameCollection" syncable="YES"/>
+        <relationship name="gameCollection" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="GameCollection" inverseName="games" inverseEntity="GameCollection" syncable="YES"/>
         <relationship name="previewSaveState" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SaveState" inverseName="previewGame" inverseEntity="SaveState" syncable="YES"/>
         <relationship name="saveStates" toMany="YES" deletionRule="Cascade" destinationEntity="SaveState" inverseName="game" inverseEntity="SaveState" syncable="YES"/>
         <uniquenessConstraints>
@@ -73,7 +73,7 @@
     <entity name="GameCollection" representedClassName="GameCollection" syncable="YES">
         <attribute name="identifier" attributeType="String" syncable="YES"/>
         <attribute name="index" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <relationship name="games" toMany="YES" deletionRule="Nullify" destinationEntity="Game" inverseName="gameCollections" inverseEntity="Game" syncable="YES"/>
+        <relationship name="games" toMany="YES" deletionRule="Nullify" destinationEntity="Game" inverseName="gameCollection" inverseEntity="Game" syncable="YES"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
                 <constraint value="identifier"/>
diff --git a/Delta/Database/Model/Human/Game.swift b/Delta/Database/Model/Human/Game.swift
index 9fa807a..43448d5 100644
--- a/Delta/Database/Model/Human/Game.swift
+++ b/Delta/Database/Model/Human/Game.swift
@@ -90,7 +90,7 @@ extension Game
             print(error)
         }
         
-        for collection in self.gameCollections where collection.games.count == 1
+        if let collection = self.gameCollection, collection.games.count == 1
         {
             // Once this game is deleted, collection will have 0 games, so we should delete it
             managedObjectContext.delete(collection)
diff --git a/Delta/Database/Model/Machine/_Game.swift b/Delta/Database/Model/Machine/_Game.swift
index de5809e..a1fb05f 100644
--- a/Delta/Database/Model/Machine/_Game.swift
+++ b/Delta/Database/Model/Machine/_Game.swift
@@ -30,7 +30,7 @@ public class _Game: NSManagedObject
 
     @NSManaged public var cheats: Set<Cheat>
 
-    @NSManaged public var gameCollections: Set<GameCollection>
+    @NSManaged public var gameCollection: GameCollection?
 
     @NSManaged public var previewSaveState: SaveState?
 
diff --git a/Delta/Game Selection/GameCollectionViewController.swift b/Delta/Game Selection/GameCollectionViewController.swift
index 82d275e..4468f17 100644
--- a/Delta/Game Selection/GameCollectionViewController.swift	
+++ b/Delta/Game Selection/GameCollectionViewController.swift	
@@ -219,7 +219,7 @@ private extension GameCollectionViewController
         
         if let gameCollection = self.gameCollection
         {
-            fetchRequest.predicate = NSPredicate(format: "ANY %K == %@", #keyPath(Game.gameCollections), gameCollection)
+            fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(Game.gameCollection), gameCollection)
         }
         
         fetchRequest.sortDescriptors = [NSSortDescriptor(key: #keyPath(Game.name), ascending: true)]