#888 Fix for --watch+only() issue
Merge pull request #1172 from startswithaj/master

#888 Fix for --watch+only() issue