Bug: do not save undone entities in block definition