Fixes observe and unobserve