Correction on null values
Correction on null values