Seems to fix the first generator bug.  Not sure why, need to study Triq some more