Fix the default context behavior