fixed client / publisher handling