Fix general graph matching