fixed issue #122