Work on a copy of the original list, then update the map. Fixes #1