Fixed Bug 1047226

Fixed Bug 1047226

Fixed Bug 1047226