fix(rates): changes in rates calculation logic