we want to fix this for add-ons too? not just webapps?