crappy solution to Issue #422: now working with cell headers, fixed a lint issue as well