Attempt to fix the crash