some fix for endpoint publishing