Fixed bug with thread watcher and switch back

to JSON downloader #25