Fix minor bug with new context scheme.