Tweaked pub sub check