Fix blasted bug with HTML entities