change #649 also fixes [RT #588]
change #649 also fixes [RT #588]

each/bind9-collab,pecharmin/bind9,pecharmin/bind9,pecharmin/bind9,each/bind9-collab,each/bind9-collab,pecharmin/bind9,pecharmin/bind9,each/bind9-collab,each/bind9-collab,pecharmin/bind9,each/bind9-collab