this has been fixed upstream