Fix for morphology/observer changes