Fixing the movement (per Milda's change)