added another fix
This merge has another hotfix

Merge branch 'hotfix/anotherFix'