Fixes  NERDZIlla issue #188