quickStepMode issue fixes