Fixed issue with token arrays