fix Issue 12201