stage2 fixed
stage3 fixed