issue #29 fix