[0.1.2-9] ACTUALLY fix the crash bug