Fixed match.id being set to undefined