same bug fix for column expand and row/column expand