Re-fixed the previous bug

The previous bug is not actually a bug. It was correct.

The original column is still useful (for grouping column for example)
    and so it should be kept.