Fixes  NERDZIlla issue #173