fix for github issue #9