extendAllHelpers wrap fixed