Really fix the crash