Fixed Bug 1047226