fixed issue #32