Fix for an Issue #902