Fixed subscriber bug