fixed do-continue support