Fixed Bug 1035190