Fix for an Issue #397