(#8) Correcting tokenised value