Fixed issue #93