Fixed fee calculation logic, should be more accurate now