Fixed for repeater fields