diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 0d6a13e546..d24e566159 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -275,7 +275,8 @@ void PlayerMinus::Update( float fDeltaTime )
 		const StyleInput StyleI( m_PlayerNumber, bar );
 		const GameInput GameI = GAMESTATE->GetCurrentStyleDef()->StyleInputToGameInput( StyleI );
 		bool bIsHoldingButton = INPUTMAPPER->IsButtonDown( GameI );
-		if(bIsHoldingButton && !GAMESTATE->m_bDemonstrationOrJukebox)
+		// TODO: Make this work for non-human-controlled players
+		if( bIsHoldingButton && !GAMESTATE->m_bDemonstrationOrJukebox && GAMESTATE->m_PlayerController[m_PlayerNumber]==PC_HUMAN )
 			m_pNoteField->SetPressed(bar);
 	}