Fixing the Context