Fixed issue #88