address issue #122