fixes all other vars with same problems (last commit)
Merge pull request #6 from michiwend/master

fixes all other vars with same problems (last commit)