Avoid double-adding orphans