Fixed retry count was not saved for Commands in the Queues