Match settings fix