Fix when value is null