Fix regexp and syntax