fixed in #1368 - also changed other uses of `Memento` wrt mgmt