Fix breaking issues with debug mode
Merge branch 'hotfix/1.1.1'