Fix for list issue