Fix for an Issue #889