Fix stage not passed bug