Try to fix column handling