Github issue #219