Fix #14856

[skip sauce]
Merge pull request #14857 from twbs/fix-14856

Fix #14856