Fixing the map insertions.