Updated fix for issue #1590, Also fixes cell height.