Fixing data with correct match data