- Fixed import race condition