Fix problem with populate null values