Moved the force-wrap to a more general location