Fixed the array list issue