modify avalon to fix findNodes