Working on Pub/Sub corner cases