fixed do/while more keywords