bug Step2 fix