Repair just the box contaminated by previous text
Update for Cairo changes