Changes for #154 TC Escaping