Fix subscriber toggle bug