PubSub - Bug fix using Closures