Fixed issue #115