Fees bug fix