Built-in observers now work correctly