bug fix for non-array token data