1 fixed the crash issue