Github issue #188