Fixed Bug 1024119

Fixed Bug 1024119