fix Issue 11957