Fixed problems with missing values