smarter wrapper technique - fix