Fixed buggy state observer