A little rearrangement in setup