Fixing nested contexts