Fixed the list return (none type) bug