Fixed: New regex