Fix Github issue #184