Count moves
Bugfix