Small bug - unsubscribing was producing an error.