Fix command replies stacking up