Done, added regex escape for special chars