Fix issue with adaptor commands being overridden further up the chain.