address issue #126