Fixed wrapper issue