ListView bug fix