Fix Defect 3 - Undefined input