roll back change to if (exists) in dynamic, to fix #742
add xrefs