fixing an issue with &amp; escaping