Fix for repeater field cleanup