Better match handling