Unsubscribe issue fixed