adapt validator bugs