Fix for an Issue #804