Fixed unsubscribe bug