#935 - Use ArrayList instead of an unmodifiable list