Fixed issue with deleted service