Patch from Erik Hovland, via Tito.