Github issue #206