I took the liberty to commit a patch which circumvents the problem in c59fe32ec2746e37cdb23cf9de2259670180b6d4