Attempt to fix column generation