Will has made a rather elegant hack