Additional bug fix with missing values.