Fix problems with MultiMap