Fixed pubsub issues with destroy