PT-1: fix list as well