Race condition kind of fixed