diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
index f9bb7ca5..1b701874 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
@@ -229,8 +229,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 			R.id.edit_save -> saveOrEdit()
 			R.id.add -> addNewHand()
 			R.id.delete -> deleteHand()
-			R.id.back -> showPreviousHand()
-			R.id.forward -> showNextHand()
+//			R.id.back -> showPreviousHand()
+//			R.id.forward -> showNextHand()
 			R.id.share -> exportHand()
 		}
 		return true
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
index 50842194..25d8c28c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/ActionList.kt
@@ -427,7 +427,10 @@ class ActionList(var listener: ActionListListener) : ArrayList<ComputedAction>()
 			val activePlayerCount = activePositions.size // don't move this line because of removes
 
 			// Blinds must act
-			if (!significantAction.action.type!!.isBlind) {
+			val sa = significantAction.action
+			if (sa.type!!.isBlind && getStreetNextCalls(sa.index).isEmpty()) {
+				activePositions.remove(significantAction.position)
+			} else {
 				activePositions.remove(significantAction.position)
 			}
 
@@ -448,9 +451,9 @@ class ActionList(var listener: ActionListListener) : ArrayList<ComputedAction>()
 					Street.SUMMARY
 				}
 			} // BB Walk
-			else if (currentStreet == Street.PREFLOP && activePositions.size == 1 && activePositions.first() == Position.BB) {
-				return Street.SUMMARY
-			}
+//			else if (currentStreet == Street.PREFLOP && activePositions.size == 1 && activePositions.first() == Position.BB) {
+//				return Street.SUMMARY
+//			}
 
 		}