Table view bug fix