Fix Github issue #104