v1.1 - Defect Fix