fix fees vs. tax refactor, RT#76366, RT#76490