(TODO) Bug on race condition still exist, take a break