Fix misinterpretation of 'SELECT *, COUNT(*)'