Fix usage of lists