Fix issue for wrapper