Fix undefined matches