fix cal context issues for cell