New repeat fixes