Added wrapper fix