removed regexp (again)