handle special cases when old or new entity is out of scope