Fixed validation issue