Make example manual expansion compatible