Working on fixing the crash.