Fixed Command Saving