Patch options to be a raw string for now