Fix problem caused by 6bffcd742ee7877fa1b5b9fc154

We were attempting to mutate an immutable Map
Merge branch '2.3.x'