Initial fix for ListViews