this patch should go upstream soon. meanwhile I forked it.