See issue #152