Fixed regex grouping