fixed publish subscribe