Arraylist fix