Fix #54: Entity was modified