Fixed bug using HTML entities