still regex fixing