fix for Bug 1033617