Attempt to fix a crash