Correct a very rare case where command ordering could be compromised