fixed issue #39