now correct for the general case