Fix context to be backwards compatible with String values