Fixed bug with unsubscribe method