Fixed issue #92