Since I'm personally not confident if the fix is the right way, the
actual fix will be done after asking the gpg list.

Regards,
-- 
Daiki Ueno