Comment 3 for bug 1622017

Thank you Toshihiro-san.

I tested your first patch set "as-is" and it didn't seem to work. I included the change suggested by another reviewer and it did appear to resolve the issue.