Fix for missing move commands