Partial fix for Bug 1408

No match.