fix #12298
Merge pull request #12308 from twbs/fix-12298

Fix #12298