Fixed ADH and PLAINTEXT cases.