Fix issue #40 for non-families.