Fork and fix the patch never merged upstream sent 4 months ago