#611 trying to reduce race condition even further.