Fix long standing bug with fee's