Maybe the easiest way to correct this is to record the MapNode objects before they are changed, and then if a rollback occurs, to replace the newly-changed MapNode objects with the original. This is a bit more complicated, since individual MapNode methods are called to change the node.