Fix order and completed game