@shamg: repair