Fix stage problem