- fixed issue #29