fix Singular in map