Actually fixed the crash