quick fix for 3rd party services