Fix fee issue