Bug/loop while playing

Fixes #250