Fixes XN bug
Merge pull request #742 from lukecampbell/fix_pubsub

Fixes XN bug