Fixing Bug 1024087

also, indent the callback function body