Fixed the calling of completion handlers in custom services.