more fixes for #9513
Merge pull request #9625 from twbs/fix-9513-more

more fixes for #9513