Fix the bug which prevented proper unsubscription.