Heat racing fuel calculation does not work

In iRacing, when racing in a heat race, the fuel calculator uses the laps remaming to calcuate fuel, usually 99. so always tells you to take maximum fuel. This should use time remaining (Which is also broken in heat racing, see other issue posted)