Fix for index on parallel arrays