Fix possible delta from invalid entity