Fixed bug in unsubscribe