Added Anduin Withers' js-annoyances fix