fixing ListItem
merge upstream