fix list and single-list