fixed issue #33