Fixed a bug around %X token recognition. Revved to release 8.