Fixed bug with missing nulls