reuse ivars if exist in wrapClassName
Merge pull request #595 from herby/fix-wrap-ivars

reuse ivars if exist in wrapClassName