Fix stage transitio