Fixed Bug 1019640