fixed wrapper issues