fixed validation issue with empty values