Quick fix to service wrapper.