See a0aa790. Can you test this works?