Correcting use of immutable map.