Resolve Bug 21222.
Resolved Bug 21222.