Better nowrap fix