fix token concatenation