Fixed bug: Redo changes to enhanced for loop
(c.f. 't = t.split...')