Fix pub sub messenger