Fee calculator fix