fixed issue #29