Fixed listview issue