Fixed not working defect