fix problems with specifying service name explicitely.