Fixed issue #92, #91.