reentering crash fixed