Fixes #201 and fixed some consistency issues between publishing & sending