double regex fix for #59