Fixed #9356

[SVN r86712]
Fixed #9356

[SVN r86713]