Fixed tiny bug with Subscription