fix issue #34

fix issue #34