FIX - Track cell indexPath issue