bugs fixed of Step2