Fixed issue #889