Fix command/credit counters resetting when using step button