Libs/Lists: (Hopefully) final fix