Fixed regex (again)