fixing bundle race condition