Fix some bug in steps