#205 changed lookup