Fixed issue #94