Maybe fixing the crash