Fixed broken column handling