Fixed move order not being followed up correctly