Fixed the ListObject problems