Fix stage loading