Fix Stage(2)