Fixed a potential NPE
Fixed: _ variables work now, closes #17