fix to be playable with CLI
Merge branch 'work'