solicit-response/port/logic fix