fix regression on observation refactoring.