Issue Fixes

Fix the issue where the game flow might get stuck during the early stages.