Index bootstrap fix