Fix to list handling
Updated version