Fix game manager
Merge branch 'fix'