Small fix for unescaping &amp;# entities