Fixed weirdness while moving