Tables to ArrayList fix