Here's a fix that seems to work, but I'm not very experienced in
hacking Elisp so I'm probably doing something stupid.