temporary hack for service providers