Fixing issues with parsing long tokens since INDX update...