Thanks for the patch @chipway
I've merged patch in 8.x-1.x branch.