Fix more cells problem