Fixed issue #95