fix ordering in session construction so that new sessions and existing ones both work