Potential fix for an Issue #843