It really does work this time. The last version got stuck in an infinite
loop.