Fixed issue #98