Object.observe fixes