Fix bug on first move