Fixing FeeService class