Fix issue defaultService