fixed validation issue