Fix - select only defined columns.