Fixed other arraylist as well