Fix 'Fail to import service with CP'-bug