issue #33 fix