Bugfix when creating moves