Encapsulating protocol bug fix.