Fixes  NERDZIlla issue #160