Not sure this is necessary, as it might cause us to do this in every single place where a list item is used?