Another fix for arrays and cell templates