Fix ArrayList issue