Fix match data entry