Another static ArrayList fix