updated issue #121