cell related bug fix