"Final" fix for #9, now it's good enough.