epic bug fix with cell heights