added cascading fix for repeated fields