Bug Fix

- fix bugs while doing re-tokenising