Adaptors really are a stop gap. But yeah, in the short term its a pest.