Fix for an Issue #904