Fix obsolete variable
Merge branch 'hotfix1'