Fix bug in character reference handling code