fixing wrapper