Github issue #199