fix to not unobserve null values