Tighten having clause per @seanlinsley @Changaco