Fix matches attributes