Kit clashes

I'm putting this here in the hope someone from the programming side reads it. It's not a bug but it's literally making some games unplayable. 

You've put the new kit comparison at the start of H2H games, but if either team's captain is the Goalkeeper then it's pointless - you don't see the kit the outfield players wear. Then you start the match and see both sets of players in sometimes identical kit. Pretty sure you know that's a problem, so please fix it.