fixed regex issues