Fixed missing value corner cases.