fix issue #34