Fix dynamic lookup