Re-fixed the crashing issue