Really fix race condition problem this time