Maekawa try to fix race condition