fixing a bug introduced with the autoloading of services

and merging with karel1980/master