fixed up returning context.