fixed issue #34