I tried to fix with the attached patch.

Regards,
Shigeru