fix for potential issue with repeatable fields from previous commit