Replacement tokens corrected