Fixed a race in the subscribe case