Fixing Recalculate Rates