Fixed issue with re-initalization, where later tokens in the string were ignored
Merging