Fixes problems with extra columns showing up in some conditions
Merge remote-tracking branch 'systay/weird-columns' into 1.9-maint