Fixes NERDZilla issue #60