Fix the issue of multiple charges at the end of a game