fixed expand_exclude