Add proper concatenation on @tokens