fix usb inheritance just like drew's commit