Fixes  NERDZIlla issue #139