better term & wrap fix