Fixed Måns' raw arraylist. Sharping on you, Måns!