FIX: fix list issue