Fix columns stacking too early