Fixing Bug 1024087