Fixes  NERDZIlla issue #179