Fix dispatcher plaintext inclusion as well