Fix expand options