Fix Github issue #1