Mihir | Fixing defect