Urgent fix for service not starting up correctly

A regression from the refactoring, now fixed.