Fix list issue