Repaired global i