Fix bug in the new protocol implementation