Adjustment to prevent errors for existing contexts