fix to not unobserve null or not observed values