Fixing Recalculation of Rates