Improve the fix for hosting_context.