Fix up multiple options for a single disguise