adding TODO for possible race condition