fixed issue #20