Change interface to fix race condition.