Finished fix of draw game handling