Fix subscriptions race.
Merge pull request #77 from nmaier/race

Fix subscriptions race.