fix index safe list