Handle columns more gracefully