more continue fixes