Fixed 'Only last token/file pair is used' issue