add changes for protocol > 61