fixed expand-sets