Fix the dispatch of the custom service commands