Minimal hack/fix for DOM mutation bug