Fix nil entries problem