Fixed Bug 1024119