adjust regex for #13