fixed issue #50