More fixes, but now an empty ArrayList has appeared...