Fixed array list issues