fix wrapper and rebuilf
Merge branch 'fix_wrapper'