Attempt to fix different protocols issue