ensure we call advance with the correct context