Fixed : Validation issue # 61