#125 Fixed issue with globals scope