Inclusive fix for repeatNumber elements