Fixing protocol more.