fix pre-movement behaviour