Added nulls replace