Fixed issue with server record not reflecting actual server when have port collisions.