further changes for fees fix