Fixed race condition in create/teardown (hopefully)