Fixed issue #122