Fixed issue #121