Github issue #217