Almost fixed bug with tokens inside body
Handle tokens inside body