Fix issue with deletion and replacement of object in structure/map