Regex fix #2