Quick fix for bad node matching