fixed regex match order