Fix/map remove backup 3.3.4

Fixes #4360