[WIP] Trying to solve rateService issue (#1457)