Fixed for peer uri lookup #640 #633