Fixed crashing defect