Fixed bug with empty lists/dictionaries