bugfix + publisher wrapper class