Hopefully fixed the crash on load