Attached simple patch could fix this.
Is there no regression with this change?

Regards,
—Naofumi