Fixed evil race condition!