Fixed Bug 1011295

Fixed Bug 1011295