fix bug with not getting the right rest-client
watcher: fixed logic errors. this should be the official release of it.