issue #33
fix issue #33