Subscription fix

Crash due to multiple subscription in a row fixed