Fix movements engine