Fix for an Issue #900