Fixed issue watching for changes on service