Repaired version