diff --git a/src/GroovePlayer.cpp b/src/GroovePlayer.cpp
index f250c383069de2a75f3db3a2af427c88c6ae3ad1..a877ab68a868e45bef5cbf70acca37722b80900e 100644
--- a/src/GroovePlayer.cpp
+++ b/src/GroovePlayer.cpp
@@ -295,12 +295,12 @@ void GroovePlayerMgr::grooveEventLoop()
                     else if(pick <= 9)
                     {
                         //Second track wins.
-                        winner = (*currentVoteBatch.begin()++);
+                        winner = (*std::next(currentVoteBatch.begin(),1));
                     }
                     else
                     {
                         //Third track wins
-                        winner = (*(currentVoteBatch.begin()++)++);
+                        winner = (*std::next(currentVoteBatch.begin(),2));
                     }
                 }
             }