Fix: Observer Issues