Defect fix for Kit Management