fixed bugs in unstable/wrapc original commit: 7828a7bfa78ac6591ea7074cdf85f3cd0ca12baf
original commit: 28b404307793f041bb3363135a2968e283855318