Fixing Bug 1024087

Fixing Bug 1024087

Fixing Bug 1024087

Fixing Bug 1024087

Fixing Bug 1024087

Fixing Bug 1024087