Github issue #214