fix issue #50
fix issue #50