Fix #431 again. Previous commit couldn't make the cell span columns