fixed to pass validation