Improve protocol issue