Fixed typo
Better token replacement