Little enhancement in protocol switch