fix regexp support