Added wrapper disposal.