Fixed observer handling