2nd try at fix Issue 12989