Fixes #650 - issue when doing multiple aggregation expressions on the same identifier