Fix matches