Fix for list operations