Step2 bug fix