Fixes GH issue #1