Fix the crash