diff --git a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
index 018fac38..51cc8a59 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
@@ -177,8 +177,9 @@ class PokerAnalyticsMigration : RealmMigration {
         if (currentVersion == 8) {
             schema.get("HandHistory")?.let { hhSchema ->
 
-                schema.get("Session")?.let {
-                    hhSchema.addRealmObjectField("session", it)
+                schema.get("Session")?.let { sessionSchema ->
+                    sessionSchema.removeField("hands")
+                    hhSchema.addRealmObjectField("session", sessionSchema)
                 } ?: throw PAIllegalStateException("Session schema not found")
                 hhSchema.addField("smallBlind", Double::class.java)
                 hhSchema.addField("bigBlind", Double::class.java)
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 7ec574ea..543c2378 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -269,7 +269,10 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 	var numberOfTables: Int = 1
 
 	// The hands list associated with the Session
-	var hands: RealmList<HandHistory> = RealmList()
+//	var hands: RealmList<HandHistory> = RealmList()
+
+	@LinkingObjects("session")
+	val handHistories: RealmResults<HandHistory>? = null
 
 	// The list of opponents who participated to the session
 	var opponents: RealmList<Player> = RealmList()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
index dc029cff..0f3eddb4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
@@ -358,7 +358,7 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
 	}
 
 	private fun addHandHistory() {
-		HandHistoryActivity.newInstance(this, this.currentSession)
+		HandHistoryActivity.newInstance(this, this.currentSession, true)
 	}
 
 	/**