possible fix for github issue #8