Corrected a bug that make empty maps break.