Fix for an Issue #339