Dodge some more potential protection issues