Core Crash fixed