trynna get rid of that race condition (given that it is one)