Fixed issue #106