Fix for an Issue #999