Fixed issue #108