Fix #6864 - dynamicall adding columns