fixed regex matching