54 sync subscriptions

This fixes the problem of the sync of subscriptions in the working branch.
But maybe it is more a workaround instead of a real fix.