I think this has been fixed upstream