Fixed crashing
Fix crashing issue