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