fix some bugs in subscription model

introduced two commits ago