Hopefully solved another protocol bug