Thanks @ppitonak .

Since this PR was already merged. do you mind fixing it on upstream ?