Github issue #190