bug fixing for Bug 911169