FIX: list issue