Fix an expansion bug