fix usage of removed globals
Merge pull request #64 from cfoellmann/develop

fix usage of removed globals