* delimit state fixes