fix rate calculation
fix rate calculation