Trying to fix the crash on loading...