Added possible fix for lists of objects.