Crashing issue fixed