Half baked fix for the listview