Fix for services with dots in name