merged in changes for escaping '^'