fixed github issue #34