Updated bug
Merge branch 'hotfix/gettextbug'