prev. fix also apply step mode.