fixed watching/observing