fixed regex from jm