I was actually using the wrong Map

Fixes #2113