ohai borja

Fixes issue #2, but introduces a race condition. :( But it fixes issue #2!

I don't think it's possible to do it without a race condition.