Patch from Trond Myklebust <trond.myklebust@fys.uio.no>

This has been floating about for a while, and fixes the oops which people
keep on reporting.