minor bufgix
Merge branch 'hotfix/1.1.3'