Fixed Crashing issue