Attempt to resolve race condition