Try to fix issue with duplicate FindUnmatched

should fix #68