Correctly save commands