Issue #435 update regex