Created a patch to fix this issue, please review.
Thanks!