Bug with tableView update is finally defeated!