Fixed column statefullness issue