Github issue #195