Fixed Bug 1050236