hotfix on variable names