Fix Multiple Watch File Bug