Fix angle brackets escaping