fixed issue #31