This was a big that was fixed awhile back but seems to have been reverted*snipping log*
So I did fix this before, but didn't realize it comes up at a bunch of different spots in the code.So now I tried to fix it in each of those.