Fix expand