Fix school index issue