Bugfix w/ missing values