workaround issue 7702 and import wraps where needed

see issue #7702