Actually fixed HTML entity decoding