Fix for service stop / start resources