Fixed case where NA values should be actually be zero.