Fix issue with expressions that count columns