added a hotfix
This fix fixes everything!

Merge branch 'hotfix/v1.1'