added fixed regex