Fixes  NERDZIlla issue #45