Fix columns overflowing