added race condition TODO so we don't forget about it