Fixed Bug 1032795