Fixed game id logic