Fixing bug from jklewa:sortable_cols merge