Patch for http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8439#13