fix watching bugs