Fixes change-observing bug in a less buggy way >:-O