Fix protocol issue