updated regex #23