small fix
Merge branch 'hotfix/fix' into develop