fixed issue #123