Fix issue #121