[CDF-277]: Fixing bug introduced by column layout