Commit before machine switch