Bug fix: missing values - null