forgot to readd resolveMatch() call, now added