Fixing bug in last commit (collection token attributes)